From 7ac3fd39ebbbbaafd3c3b0607b8301f24d716a38 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Fri, 10 Nov 2006 11:14:47 -0700 Subject: [PATCH] [IA64] build fixes Add defines to fix hvm_vioapic and trivial warning fix. Signed-off-by: Alex Williamson --- xen/arch/ia64/vmx/vmx_init.c | 2 +- xen/include/asm-ia64/config.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xen/arch/ia64/vmx/vmx_init.c b/xen/arch/ia64/vmx/vmx_init.c index d13118b8cf..d4be24cc95 100644 --- a/xen/arch/ia64/vmx/vmx_init.c +++ b/xen/arch/ia64/vmx/vmx_init.c @@ -276,7 +276,7 @@ static void vmx_create_event_channels(struct vcpu *v) p = get_vio(v->domain, o->vcpu_id); o->arch.arch_vmx.xen_port = p->vp_eport = alloc_unbound_xen_event_channel(o, 0); - gdprintk(XENLOG_INFO, "Allocated port %d for hvm.\n", + gdprintk(XENLOG_INFO, "Allocated port %ld for hvm.\n", o->arch.arch_vmx.xen_port); } } diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h index 38ffe33b82..05910e4310 100644 --- a/xen/include/asm-ia64/config.h +++ b/xen/include/asm-ia64/config.h @@ -280,4 +280,9 @@ struct screen_info { }; /* Define CONFIG_PRIVIFY to support privified OS (deprecated). */ #undef CONFIG_PRIVIFY +/* Necessary for hvm_vioapic.c */ +#define vcpu_vlapic(vcpu) (&(vcpu)->arch.arch_vmx.vlapic) +#define vlapic_vcpu(vpic) (container_of((vpic), struct vcpu, \ + arch.arch_vmx.vlapic)) + #endif /* _IA64_CONFIG_H_ */ -- 2.30.2